diff --git a/templates/article.html b/templates/article.html
index e3a8cc3..52dc6a3 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -7,7 +7,7 @@
 {% block content %}
 <article>
   <div id="article_title">
-    <a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a>
+    <h2><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></h2>
   </div>
 
   <div id="article_text">
diff --git a/templates/base.html b/templates/base.html
index a554ca9..383946f 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -35,7 +35,7 @@
         {% endif %}
       </a>
       <h1><a href="{{ SITEURL }}">{{ AUTHOR }}</a></h1>
-      <h2>{{ TAGLINE }}</h2>
+      <p>{{ TAGLINE }}</p>
       <ul>
         {% for title, link in MENUITEMS %}
         <li><a href="{{ link }}">{{ title }}</a></li>
@@ -57,11 +57,11 @@
 
   <main>
     <header>
-      <h3>
+      <p>
         {% block header %}
         <a href="{{ SITEURL }}">Index</a> &#124; <a href="{{ SITEURL }}/archives.html">Archives</a> &#124; <a href="{{ SITEURL }}/categories.html">Categories</a>
         {% endblock header %}
-      </h3>
+      </p>
     </header>
 
     {% block content %}
diff --git a/templates/index.html b/templates/index.html
index a68bf6b..670d4b1 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -3,7 +3,7 @@
 {% for article in articles_page.object_list %}
 <article>
   <div id="article_title">
-    <a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title }}">{{ article.title }}</a>
+    <h2><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title }}">{{ article.title }}</a></h2>
   </div>
   <div id="article_text">
     {{ article.summary }}
diff --git a/templates/page.html b/templates/page.html
index 91695f1..90f04e6 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -7,7 +7,7 @@
 {% block content %}
 <article>
   <div id="article_title">
-    <a href="{{ SITEURL }}/{{ page.url }}" rel="bookmark">{{ page.title }}</a>
+    <h2><a href="{{ SITEURL }}/{{ page.url }}" rel="bookmark">{{ page.title }}</a></h2>
   </div>
   <div id="article_text">
     {{ page.content }}